Work around gcc stupidity
authorMatthias Clasen <mclasen@redhat.com>
Thu, 13 Mar 2014 02:47:10 +0000 (22:47 -0400)
committerMatthias Clasen <mclasen@redhat.com>
Thu, 13 Mar 2014 02:47:10 +0000 (22:47 -0400)
With -Wc++-compat, gcc warns about 'and' even in contexts where it
poses absolutely no danger.

https://bugzilla.gnome.org/show_bug.cgi?id=726136

gtk/gtkwidget.h

index bf47657b392fd04b0516217e8962399a5b97fc29..9e2a4a4d69dcdca4bbf02931cc822ef25ddd2ada 100644 (file)
@@ -946,7 +946,8 @@ GDK_AVAILABLE_IN_ALL
 void                  gtk_widget_set_allocation         (GtkWidget     *widget,
                                                          const GtkAllocation *allocation);
 
-GDK_DEPRECATED_IN_3_0_FOR(gtk_widget_get_preferred_width and gtk_widget_get_preferred_height)
+GDK_DEPRECATED_IN_3_0_FOR(gtk_widget_get_preferred_width & gtk_widget_get_preferred_height)
+
 void                  gtk_widget_get_requisition        (GtkWidget     *widget,
                                                          GtkRequisition *requisition);